gdk: Move GdkSurfaceState to the right header

This is really a toplevel state, so move it
to that header.

diff --git a/gdk/gdksurface.h b/gdk/gdksurface.h
index dde646e807c93a8564ce771bd327de3b126563c6..72e9b79258edb5b0e3c2fddb11ae130f51eb360a 100644 (file)
--- a/gdk/gdksurface.h
+++ b/gdk/gdksurface.h
@@ -63,55 +63,6 @@ typedef enum
   GDK_SURFACE_EDGE_SOUTH_EAST
 } GdkSurfaceEdge;
 
-/**
- * GdkSurfaceState:
- * @GDK_SURFACE_STATE_WITHDRAWN: the surface is not shown
- * @GDK_SURFACE_STATE_MINIMIZED: the surface is minimized
- * @GDK_SURFACE_STATE_MAXIMIZED: the surface is maximized
- * @GDK_SURFACE_STATE_STICKY: the surface is sticky
- * @GDK_SURFACE_STATE_FULLSCREEN: the surface is maximized without decorations
- * @GDK_SURFACE_STATE_ABOVE: the surface is kept above other surfaces
- * @GDK_SURFACE_STATE_BELOW: the surface is kept below other surfaces
- * @GDK_SURFACE_STATE_FOCUSED: the surface is presented as focused (with active decorations)
- * @GDK_SURFACE_STATE_TILED: the surface is in a tiled state
- * @GDK_SURFACE_STATE_TOP_TILED: whether the top edge is tiled
- * @GDK_SURFACE_STATE_TOP_RESIZABLE: whether the top edge is resizable
- * @GDK_SURFACE_STATE_RIGHT_TILED: whether the right edge is tiled
- * @GDK_SURFACE_STATE_RIGHT_RESIZABLE: whether the right edge is resizable
- * @GDK_SURFACE_STATE_BOTTOM_TILED: whether the bottom edge is tiled
- * @GDK_SURFACE_STATE_BOTTOM_RESIZABLE: whether the bottom edge is resizable
- * @GDK_SURFACE_STATE_LEFT_TILED: whether the left edge is tiled
- * @GDK_SURFACE_STATE_LEFT_RESIZABLE: whether the left edge is resizable
- *
- * Specifies the state of a toplevel surface.
- *
- * On platforms that support information about individual edges, the %GDK_SURFACE_STATE_TILED
- * state will be set whenever any of the individual tiled states is set. On platforms
- * that lack that support, the tiled state will give an indication of tiledness without
- * any of the per-edge states being set.
- */
-typedef enum
-{
-  GDK_SURFACE_STATE_WITHDRAWN        = 1 << 0,
-  GDK_SURFACE_STATE_MINIMIZED        = 1 << 1,
-  GDK_SURFACE_STATE_MAXIMIZED        = 1 << 2,
-  GDK_SURFACE_STATE_STICKY           = 1 << 3,
-  GDK_SURFACE_STATE_FULLSCREEN       = 1 << 4,
-  GDK_SURFACE_STATE_ABOVE            = 1 << 5,
-  GDK_SURFACE_STATE_BELOW            = 1 << 6,
-  GDK_SURFACE_STATE_FOCUSED          = 1 << 7,
-  GDK_SURFACE_STATE_TILED            = 1 << 8,
-  GDK_SURFACE_STATE_TOP_TILED        = 1 << 9,
-  GDK_SURFACE_STATE_TOP_RESIZABLE    = 1 << 10,
-  GDK_SURFACE_STATE_RIGHT_TILED      = 1 << 11,
-  GDK_SURFACE_STATE_RIGHT_RESIZABLE  = 1 << 12,
-  GDK_SURFACE_STATE_BOTTOM_TILED     = 1 << 13,
-  GDK_SURFACE_STATE_BOTTOM_RESIZABLE = 1 << 14,
-  GDK_SURFACE_STATE_LEFT_TILED       = 1 << 15,
-  GDK_SURFACE_STATE_LEFT_RESIZABLE   = 1 << 16
-} GdkSurfaceState;
-
-
 typedef struct _GdkSurfaceClass GdkSurfaceClass;
 
 #define GDK_TYPE_SURFACE              (gdk_surface_get_type ())

diff --git a/gdk/gdksurfaceprivate.h b/gdk/gdksurfaceprivate.h
index f84f996f706482f151f6a0aa91b0d9b8a502fd9d..9715579b9b8fe61fcfd3758b0c624f241516294e 100644 (file)
--- a/gdk/gdksurfaceprivate.h
+++ b/gdk/gdksurfaceprivate.h
@@ -23,6 +23,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include "gdkenumtypes.h"
 #include "gdksurface.h"
+#include "gdktoplevel.h"
 
 G_BEGIN_DECLS
 

diff --git a/gdk/gdktoplevel.h b/gdk/gdktoplevel.h
index 119be69e535a8bf8153f30b756c8fc5fd107d245..18c014ac8bd04ae8b74b9dabc6535c8953e65017 100644 (file)
--- a/gdk/gdktoplevel.h
+++ b/gdk/gdktoplevel.h
@@ -44,6 +44,55 @@ typedef enum
   GDK_FULLSCREEN_ON_ALL_MONITORS
 } GdkFullscreenMode;
 
+/**
+ * GdkSurfaceState:
+ * @GDK_SURFACE_STATE_WITHDRAWN: the surface is not shown
+ * @GDK_SURFACE_STATE_MINIMIZED: the surface is minimized
+ * @GDK_SURFACE_STATE_MAXIMIZED: the surface is maximized
+ * @GDK_SURFACE_STATE_STICKY: the surface is sticky
+ * @GDK_SURFACE_STATE_FULLSCREEN: the surface is maximized without decorations
+ * @GDK_SURFACE_STATE_ABOVE: the surface is kept above other surfaces
+ * @GDK_SURFACE_STATE_BELOW: the surface is kept below other surfaces
+ * @GDK_SURFACE_STATE_FOCUSED: the surface is presented as focused (with active decorations)
+ * @GDK_SURFACE_STATE_TILED: the surface is in a tiled state
+ * @GDK_SURFACE_STATE_TOP_TILED: whether the top edge is tiled
+ * @GDK_SURFACE_STATE_TOP_RESIZABLE: whether the top edge is resizable
+ * @GDK_SURFACE_STATE_RIGHT_TILED: whether the right edge is tiled
+ * @GDK_SURFACE_STATE_RIGHT_RESIZABLE: whether the right edge is resizable
+ * @GDK_SURFACE_STATE_BOTTOM_TILED: whether the bottom edge is tiled
+ * @GDK_SURFACE_STATE_BOTTOM_RESIZABLE: whether the bottom edge is resizable
+ * @GDK_SURFACE_STATE_LEFT_TILED: whether the left edge is tiled
+ * @GDK_SURFACE_STATE_LEFT_RESIZABLE: whether the left edge is resizable
+ *
+ * Specifies the state of a toplevel surface.
+ *
+ * On platforms that support information about individual edges, the %GDK_SURFACE_STATE_TILED
+ * state will be set whenever any of the individual tiled states is set. On platforms
+ * that lack that support, the tiled state will give an indication of tiledness without
+ * any of the per-edge states being set.
+ */
+typedef enum
+{
+  GDK_SURFACE_STATE_WITHDRAWN        = 1 << 0,
+  GDK_SURFACE_STATE_MINIMIZED        = 1 << 1,
+  GDK_SURFACE_STATE_MAXIMIZED        = 1 << 2,
+  GDK_SURFACE_STATE_STICKY           = 1 << 3,
+  GDK_SURFACE_STATE_FULLSCREEN       = 1 << 4,
+  GDK_SURFACE_STATE_ABOVE            = 1 << 5,
+  GDK_SURFACE_STATE_BELOW            = 1 << 6,
+  GDK_SURFACE_STATE_FOCUSED          = 1 << 7,
+  GDK_SURFACE_STATE_TILED            = 1 << 8,
+  GDK_SURFACE_STATE_TOP_TILED        = 1 << 9,
+  GDK_SURFACE_STATE_TOP_RESIZABLE    = 1 << 10,
+  GDK_SURFACE_STATE_RIGHT_TILED      = 1 << 11,
+  GDK_SURFACE_STATE_RIGHT_RESIZABLE  = 1 << 12,
+  GDK_SURFACE_STATE_BOTTOM_TILED     = 1 << 13,
+  GDK_SURFACE_STATE_BOTTOM_RESIZABLE = 1 << 14,
+  GDK_SURFACE_STATE_LEFT_TILED       = 1 << 15,
+  GDK_SURFACE_STATE_LEFT_RESIZABLE   = 1 << 16
+} GdkSurfaceState;
+
+
 #define GDK_TYPE_TOPLEVEL (gdk_toplevel_get_type ())
 
 GDK_AVAILABLE_IN_ALL